Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>

	* gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.

diff --git a/ChangeLog b/ChangeLog
index dee018fe53bc0453fce486b6cce07732c016061c..c5ffa50a623b814cd6267b92222d3150630ba383 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>
+
+       * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
+
 Mon Oct 19 23:44:41 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c: rearranged some functions

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index dee018fe53bc0453fce486b6cce07732c016061c..c5ffa50a623b814cd6267b92222d3150630ba383 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>
+
+       * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
+
 Mon Oct 19 23:44:41 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c: rearranged some functions

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dee018fe53bc0453fce486b6cce07732c016061c..c5ffa50a623b814cd6267b92222d3150630ba383 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>
+
+       * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
+
 Mon Oct 19 23:44:41 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c: rearranged some functions

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index dee018fe53bc0453fce486b6cce07732c016061c..c5ffa50a623b814cd6267b92222d3150630ba383 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>
+
+       * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
+
 Mon Oct 19 23:44:41 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c: rearranged some functions

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dee018fe53bc0453fce486b6cce07732c016061c..c5ffa50a623b814cd6267b92222d3150630ba383 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>
+
+       * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
+
 Mon Oct 19 23:44:41 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c: rearranged some functions

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dee018fe53bc0453fce486b6cce07732c016061c..c5ffa50a623b814cd6267b92222d3150630ba383 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>
+
+       * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
+
 Mon Oct 19 23:44:41 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c: rearranged some functions

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dee018fe53bc0453fce486b6cce07732c016061c..c5ffa50a623b814cd6267b92222d3150630ba383 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro <lupus@debian.org>
+
+       * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++.
+
 Mon Oct 19 23:44:41 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c: rearranged some functions

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 5237870d0dde64992b8ebe6554aad0d5944e72ad..f3d1d07d29dddb58b8e170bbfdd12f8cd1f51ef9 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -538,14 +538,14 @@ gtk_drag_get_data (GtkWidget      *widget,
 void 
 gtk_drag_finish (GdkDragContext *context,
                 gboolean        success,
-                gboolean        delete,
+                gboolean        del,
                 guint32         time)
 {
   GdkAtom target = GDK_NONE;
 
   g_return_if_fail (context != NULL);
 
-  if (success && delete)
+  if (success && del)
     {
       target = gdk_atom_intern ("DELETE", FALSE);
     }
@@ -574,7 +574,7 @@ gtk_drag_finish (GdkDragContext *context,
                             time);
     }
   
-  if (!delete)
+  if (!del)
     gdk_drop_finish (context, success, time);
 }
 

diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 8f313e70ee7a04295d03f8abc265de35a0a0d6be..399a0390de488bb30ee6205e1d073809f8daff36 100644 (file)
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -44,7 +44,7 @@ void gtk_drag_get_data (GtkWidget      *widget,
                        guint32         time);
 void gtk_drag_finish   (GdkDragContext *context,
                        gboolean        success,
-                       gboolean        delete,
+                       gboolean        del,
                        guint32         time);
 
 void gtk_drag_highlight   (GtkWidget  *widget);